[BUGFIX] Dependency issue