Fix timeout commands where no --timeout specified

Fixes #17