Make oxygen machines work properly in the last commit