fix to Machine!