onMessage() fix again... but works as hell know