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

This reverts commit f6bf2ed405e04d40f80b018f28d598f871b2d321.