Fixed the double values issue