Bug fix (Issue #3)