Resolves issue #286

Resolves issue #286