Fixes #1151