Fixed fork bug