temporary fix for #3