Clean serrvlet fixing