Fixed one bug which had sneaked back in while the revert