Switch dependency in correct direction