fix 19-26