(WIP) Fix Puppet Apply issue