[Issue #7] Fixed bug