Fix of commit 7c3c7ceb9940ee988d81ccbfab8ac473d100d85a.