Fixed Bug (Issue #3)