Fixed Bug upon removing entities