Added sandhi solver handling.