More correct fix for previous commit