Fix bug caused by 6e1dd7f41485