[#1634]

Fixes [#1634]