bluewall and trigger fix