Fixes #1673