Fixed Bug No #2