Fix mapping issue for aliases #588