better fix for previous