Revert "Revert "trying to fix this""

This reverts commit 2bf4bbcc85c4c4eb93426ffd417758eb254bc397.