Fix crash with @ObjectHolder