Fix bug with infinity computing of entry, which contains plot command, which ends by "$"
(cherry picked from commit 8f807582052acce9744405ec705658a7cf818570)