Fix dynamic add and remove checks