issue #59, more break-fixing