fix gen27 and extended arguments