Added check for aliases