Reverse back chengyi's fix to #82 which was actually fixed on #117.