added autowith fix