definitive fix for issue #65