Fixes #1118