A little bit of bug fixing