little bit of bug fixing