Fix machine selection

Created by  Eelco Dolstra  on June 19, 2015
UPZXMQDENQB7CDYOYRQ322OTFUIWEPESAKANJ23LA6QAYDIL25HQC
Change contents