Fixed error on 17.8