Fix bug by 7b21ffae36