Fixes #1336