bug fixed in request handlers