#56 Fix owner assignment