provisional fix for issue #6