@nightshining fixing per Layne critique