fixed machine names...