fixed bugs from issue #21