We can remove this if we add the change below