Apply fix from commit 8f94d7d to duplicated method too