provisional fix for issue #18