Fixed double message wait with editor.