Fixed bugs (when no aliases)