fix + singleton