Issue #54: fixed, but needs clean-up