Trying to fix forking bug, need to investigate with @joshcroad