Fixed #46 (ugly work-around, but...)