Fix bug data parsing