bug fix and singleton