Fix a horrible horrible bug