fixed #381
forgot to add that the previous commit also covers #380