Fixes #1484