Reverted to old logic.