Same issue here. We should keep this as static if at all possible