Fixes #1539, workaround #1706