2nd attempt at fixing speedswapper

This is acting strangely so far. Decent chance I've messed it up this
time too.