Fixing Windsor singleton registration issue (#1136)