Fixes #1501