Fix commit b46a0dd (breaks tests for Alias and Aka).
Another fix for b46a0dd6a2.