Fixing onMessage