WIP Try to fix variable expansion