Fix Crap#2