Optimal linear commodity taxation under optimal non-linear income taxation