Fork compatibility fix

All `features/fork.feature` is passing now.