#11: additional fixes