Fixes #1184