Fixed spaces issue