Fixes #1583