Fixes #1495