Fixes #1189