Temporary fix for #32