Really fix QP size calculation (Peter Hofmann)..