Removed base suffix, fixed variable expansion missing