Bugfix for request handling