WIP - fixing missing machines parameter

Change-Id: Ic9051a77efb382c65954e43c783e7215e6f611de