Fixed a logic order