be more strict about the patch-id