2d50bd6857
This commit covers one more case similar to what is described
in the previous commit of the series (c9eebffb).