Issue 286

This should sole Issue #286