Workaround an issue