RE-adding fix for Handle lookup