[openFATE 312835] Snoek improvement.