Issue #548