Updating combined file with #9 fix