Fixes #2937