Fixed the Not Shared bug?