Actually fixed #52
Didn't test to see if it compiles