solve singleton issue

related to #19