Issue #4 - fixed problems