Fixes #2473.