Fix general step