Fixes #1465