YAY BUGFIX MOTHERFUCKER