fix all factories