Fix horrible horrible bug