Fix for extra spaces