Added the fix for free variable parsing bug that was already implemented in the back-up.