Ref #1505

Ref #1505