(unless this is in response to a bug and has been carefully tested I think this maybe should be reverted and re-evaluated)