Fix for #362