Now works on puppet 3.6