Fix creation/delation detection