Ref #1550

Ref #1550