Fixing aliases