Little bug fixing