Fix removed overlaypicker