Workaround fix for #161