fix M26 and M23