Added fix for whitespaces