Address Issue #55