re-apply tamas change