Bug fixing

bug fixing for issues:2