Fixed the problem when key contains comma