Reverted to clear bug