Fixed static calls