Fixed bug where actions were triggering twice before their effects were calculated