fixme: handle garbage entities