fix (workaround) for issue #48