Fix for dependency management (by JWUST)