Fix for small values count