Fixes #1272