Fixes #1302