Fixed bug: issue #2