fixed handling of requests;