Made lowercase fix to when command