Fixed bug with fork