bug fixing round 1