Fixed the issues