fixed #125
  but I didn't test it, yet, because I don't have envrioment to test.