Add workaround for issue