fixed removal of thread-local fields of Flow