resolve the issues