Recreated fork to avoid conflict