maybe related to #1690

Can be also related (indirectly) to #877 which can be close also if we implement this issue.