Adopt simplification proposed by mineo