Issue #503 completed