[sprint 45 resolved modification]