Fixinf bug with Exaxt Location/Filename fields