fix the first issues