fixed: issue with generic types declaration