Factor target

But it failed compatibility with 4.4.o