Fix the static calls