fixes #2706

Change we discussed