Revert "Revert "ForkFix""

This reverts commit 577e4dd69d387d680266b6fd41a76e9d23090bda.