Fixed problem with generic in Collections