fix recent bug