Core Features #8, Fix, Consistency
Core Features #8, Fix, Consistency