Fix bug on execute