Fix instant parsing

Enhance performance