Finally fix Nil dependencies issue