This fixes #539