Fixed swap interval + context version bug