Fixed issues with white spaces