Issue #504 completed