This fixes #592