826 Fix logic