fixed for legacy machines