Fix for lingering master files