a little bit of bug fixing