Reorder calling sequence to work