Trying fix for source parsing