FIXED - Now works with puppet 3+