Fixed adding null values to source words (for real this time)