No more origin and actions called twice