A fix for the last fix that was utterly wrong