Fix upper/lower mix-up