Dev; Swap handling bug fix.