fixing variable expansion still