Bug Fix: Ok I'm tired