re-commit arrow entity fix