Fixes #1595