#32 fix problems(completed)