fix non-machine bug