Fixed the substring