Make sure the default bin is only used for modulo data.
Merge pull request #2110 from jburel/rebased/develop/viewer-issue

Viewer issue (rebased onto develop)