Fix soap loading