#182 fixing selector