Changed to handle whitespaces after '='