Fixed in order to follow v0.12 factory guideline