Fix bug, style