Fixing issue with owner-checker