Fix design: #32