Fixing #702 to conform with #694, #697

Fixing #702 to conform with #694, #697