Mutiple bug fixing