Fixes #1463