Fixes #1183