Onmessage fix