Fixes #1194