Updated Issue #32 fix