Close #13: Change definition of aliases