Fixed the well-known nazco bug™ even more!