Adjust parsing slightly, stabilized