Fixes #2688