Bugfix for servlet engine