bugfix with channel timeouts