This fixes #1360.