Fixed the single machine calls