Fixed pivot issue