Fixes #2128