End of day bug fixxed