Revert "Revert "another fix""

This reverts commit 23f7c7027fb296f9c95b302f348a7840ac493254.