Dependency fix [work in progress]