Bug fix

filename and parsing bugfix