SWC-1617 and SWC-1622

this isn't necessary