relevant changes from ussuri's PR