Fix logic - DUH!