revert last change and add a different fix