Fixes the issue in LP #1331744 comment #2