Fix of #85, the commit was somehow lost