BUG-23875 fixing the file expansion from variable issue