Fix for newer version of dependencities