Bug fix the former commit