CHEF-4538

Suggested fixes for  
CHEF-4538 https://tickets.opscode.com/browse/CHEF-4538