Reverted find issues