fix for #318