Bug fixing
Merge pull request #365 from mnzaki/Bug_fixing

Bug fixing