Some fix related to the commit aa528c9a6a692fa90c426c4fdb3757089