fix for #357