Fix for blank trailing values
Merge branch 'hotfix/3.0.5'