fix for #407

Done