Fix the connection with SW-extending