Fixed handling of variables in included contents