Comments starting at end of a line can not be uncommented

To reproduce:
Select some code, starting at the end of a line. (1)
Use Edit / Advanced / (Un)Comment selection, selection is commented. (2)
Use Edit / Advanced / (Un)Comment selection again, comment is commented again. (3)

Repeating these steps will toggle states 2 and 3 but the selection will not be uncommented.