Fix soap problem