Fixed forking issues