restoring more of the original behavior