What fueling state are you hitting? Generally if you fix the fueling state issue any timing issues are also fixed.

Sent from my SM-G960U using Tapatalk