Fix #156 - store factory