Fix for #405