Fix for owner id being forgotten