@wang16 singleton is used now with context checking. Please have a look again. Thanks!