Fixed bug with timeouts in ms vs. s