Mask Threaded Holes AND First Thread

One of the more common issues with masking using a regular pull plug is the initial thread isn't always fully masked. Need a better solution?