Added temporary workaround