Fix #2670

fixes #2670