Make code more robust to small bins... not perfect, but better.