Fix the issues with white-space