Fix ERR16/17