fix a bug in Container singleton