#557: Fix for callback container setting