remove bug with delimeters
working version