bugfix: ServiceLoader not thread-safe solution