Fixed bug where CurrentProcess was not always set