another fix attempt for issue #32