better fix for previous change