MODE-1444: Fix for dependencies