Improving puppet check