Fix current mark issue