support generic fix 2