fixes with controller changing