Fix #483 Cannot CTRL+C to quit with the new CLI

Signed-off-by: Thanh Ha <thanh.ha@alumni.carleton.ca>