Use my fork temporarily to fix bug