FIX: Acting and undoing repeatedly was broken