Fix reshaping + selector