Fixes #1152