work on #756