more changes for previous bug