fix for GH#36