Updated code to prevent auto triggering of AfterPicking on initialization

Updated code to prevent auto triggering of AfterPicking on initialization