Fix my amazing logic