Fixes #1110