Revert "Revert "Should resolve issue hopefully...""

This reverts commit ad4ba10dc665728c2361fc2f20f81f0e89ae7c65.