Fixed a silly design decision on factories