Fixed logic WTF