FIX #560

Fixes Issue #560