Added a workaround for (#481372)