Fixes #1260