Fixed a logic problem...