bug fixing
more fixing