Fixes #2453