fix for GH#6