bug fixing changes