Must be 2am, fixing the bug for real this time