Fix double swap on 4x4