Ref #646