Fix respond_to? stuff