Bugs added