changes for bug fixing