Bug fix (Issue #50)