changes to make it worki with puppet 2.6.16