Bug fix round3