ticket:1 for #1 attempt to fixup static