Fixed static functions