Fixes #1485