fix parsing a little...