bug fixing - part2