Fixes #1422