Issue #577 resolution