ugly fix for ugly streak code