Fixed support for no-owner cases