Fixed bug related to removed dependency