[Issue #61] Fix spaces in pairs