Not sure this is an improvement... #bugger