This fixes #656