fixed using correct entity