Minor patch, lessened dynamic service dependency