Fix #72 see previous commit (I messed up the issue number)