Temporary manual fix for #108