Fixes #1225