Fixes #2357