Temp workaround for issue