Fixes #1323