Fix my logic