AutoMaker fix (temporary)