Fixed dependecies problems