Scheduled ETA for this to be fixed?