Fix #399
Merge remote-tracking branch 'thinkscape/hotfix/additional-parameters-cleanup'
Using already populated variable
Removing unused use