fix simon's bugs