Fixed entity flush