Fixed logic 2