fix for generic