move static
fixes
fixes