FIX: Call the action functions correctly