Fixed execution bug