add optimuss auto workaround