Fix block forking