Fix one day problem