Fixes #1836