Fixed Class array and back to normal path