Fix 7596

@ser72 @karlitschek @schiesbn @PVince81