Fix Puppet bug #17286