workaround fix for #21