Added a fix for local parsing