Fix horrible bug