Truly fixed dependency issue this time.