Delete fix
Merge branch 'delete-fix' into develop