Ref #1331