Fix for puppet-mode