fixes #1224