Fix error and remove alias