Fixed bug [Issue #28]