Integrated fix into function responsible