Fix base interpretation in onwatch