Fixes #2673