last_ms added fix