fix for #370