Fix for #286