Fixed the orderBuilder which was slow due to fix parsing