fixed 2 bug(s)