Fixed adding null values to source words