Fix bug affecting CaloMode 0 and 1 (62x)

Backport of pull request 313.