Fix for puppet >= 3