better fix for previous commit