Fixed the owner bug