Fix bug in sCAL handling