Make sure C-x ESC o = C-x M-o
Use advices.  May fix #289. Still maintain #286