Fix my stuff, I'm not sure to know what I'm doing...
Bump 0.3.7