fix behaviour to be the same as the original