Fix bug with first execution