Fixes #1228