temporary fix for issue #10