Ben/fixed deletion