Fix factory bugs
Version 0.0.1