Akshay:bug fix #2