Fix for dataconnection

thanks to Pawit Pornkitprasan from CM code review