Fixing Issue401

Several, not Many