Make double optional match possible