Changed execution of actions. Resolved #5