Temp workaround for issue (fix)