Fixed regression introduced by Andreas which made EVEN THE EXAMPLES UNCOMPILABLE --- PLEASE TEST WHAT YOU DO BEFORE COMMITTING TO DEVELOP