Finalize change in parsing. Fix for #3