Fixed Issue #32