Issue #054