Fixed forking bug which was preventing #9 from working properly