[WIP] afterFind() fix for #1993

Fix for #1993

Work in progress. Do not merge yet.