fix up just like we did for monitor