issue #9 - closing bugs