Commit for fixed#3 issue