Fixed Bug: unused variable