Fix #204 in 1.9 mode