added everywhere to support strict-di