fix for listBlockOrigin and unittests