Fix for wai-2.0.0