static done for v2
bugfix 3.26