Added more fork prevention