Fixed logic!