Fixes #1494