Fixes #1340

Resolves #1340