Finally fixed dependencies