Fix smshandling