Temp fix to avoid error on UI