Bug fix. Finders should not convert handle number to int.