Improve fields parsing
Remove debug line