Performance fix in machine monitoring