Fix dependency issues

This fixes the issue for me, does it work for you too?