[adapt]: Fix #174 and updated test