Better workaround for forks