interim fix for issue #9