Fix design: #23