Remove hack to avoid empty bins