Watchapp crash fix