Fixed bug: issue #1