FUL-85 - fix issue on factory