ugly fix for ugly streak code
Merge branch 'master' into Producti