fixed 21 bug