cascade resolutino + fliKind fix