fix - using generics lead to 'override not supported' errors