Fixes #1264