Fix for #403