fixed singeton stuff