fix the main problem