Fixes #1442