Fix Tags deferred group add for OpenJDK