Fixed doctrine related listeners