Impemented getController fixes