#268 Design fixed.