Better flux handling