Fixes #1481