third fix attempt for issue #32