1.0.31 Issue #33