a much better fix for the previous commit