Issue #16 - fixed, pending confirmation