Fix spaces issue