Issue #15 - fixed, pending verification