Fix for #408.