fix the issues