fixed issue with forking