Fixing crap #3