- Fixed for new input parser scheme.