Fixes #1599