Fixed decimal issues