Dependencies crash fix