fixed dependency to avoid code duplication