Quick fix: reordering calls