Fix hello handling