Fix to fix of SL #4650

Sorry... pushed the wrong patch early. This patch has the proper callback.

Fixes 4650