polish issue #31