Fixed issue of trailing zeroes