fixing the issues