Another code dependency fix