Fixed Blacksmith again

i hope
Merge remote-tracking branch 'origin/master' into BranDev-Branch