Fixes #1495

Fixes #1495