updated fix from infra-management cookbook