Fix _last_executed issue