workaround for [Issue #225]