fixed crap code