fixed scoping issue on finders
fixed scoping issue on finders