Fixes #1241