Fixed 2 bugs regarding circle and timer