Fixed entities convert