workaround to fix issue #131