Fix up for watching