Fixed detection problems with ProjectMachineContext