addresses lessthan3/packages#3658