#46 Fix design mismatch.