Fix of fix of #72 :P