Fixes #1816