fix: id's inside expressions were not always resolved