Applied POD fix from issue #1.