fixes variable expansion