Hmmm, I think we need to do a code review :P
Quick hacky fix for #76