fix Selection Functions