Fixed possible issue with cleanup of temporary entities where blocks are changed in response.