fixed the issues