Should fix non-Griffin build