Add warning and fix spaces issue