[ISSUE #45] Fix (with test) for issue that could cause double-instantiation of a mapped Singleton