Fixes #2036