fixed parsing, no more error handling though