Fixes second half of Ticket794 Bug found by: Oana Stratulat Signed-off-by: Michael Niedermayer <michaelni@gmx.at>