fixed stuck bug