Added a workaround for the failing build