Fixed "bug out" on timeout