Fixes #1327