fix generic conditions