Fixes entity parsing