Fixes bug where day state is ended prematurely