Fixes Issue #611

Fixes Issue #611