Code changes for bug fixing 2?