Fixed static problem