Fixed bug, reported in the issue #25