fixed singlton bug