#37-2 bug fix
#26 -1