temporary fix for #7