Simple patch to temporarily fix things