Resolve somes architecture minor problem