Fix recursive dependency