Fix bug matching on optional property