[#5] Fixed bugs with singltone