fix for #407