add workaround to #23
(fix?)