Fixed client side issue on new short code

Fixed client side issue on new short code