Remove #84 as it's a duplicate of #51