tried to fix fork issues