Temporary fix for #105