Date problem fixed