bugfix and expansion in Request