Fixed dep handling