fix the first problem