fixed POD bugs