support generic fix 3