Fixes #1079