added fix for generic modules