timestamp fixed
on_command fixed