Fix for Issue #286