Fixing GenericTypeAwarePropertyDescriptor exception