Fix for Handling dependencies